From 8eeef54b2edd88553efdf173728973bfe93b3b93 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 24 Jun 2020 20:19:03 +0200 Subject: [PATCH] gtktextview: Remove child textview items last The function tries to go through every child, so it's convenient to remove all internal ones first. --- gtk/gtktextview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 65385e5246..39cba89413 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -3773,9 +3773,6 @@ gtk_text_view_dispose (GObject *object) g_object_set_data (object, "gtk-emoji-chooser", NULL); } - while ((child = gtk_widget_get_first_child (GTK_WIDGET (text_view)))) - gtk_text_view_remove (text_view, child); - gtk_text_view_remove_validate_idles (text_view); gtk_text_view_set_buffer (text_view, NULL); gtk_text_view_destroy_layout (text_view); @@ -3801,6 +3798,9 @@ gtk_text_view_dispose (GObject *object) g_clear_pointer (&priv->selection_bubble, gtk_widget_unparent); g_clear_pointer (&priv->magnifier_popover, gtk_widget_unparent); + while ((child = gtk_widget_get_first_child (GTK_WIDGET (text_view)))) + gtk_text_view_remove (text_view, child); + G_OBJECT_CLASS (gtk_text_view_parent_class)->dispose (object); } -- 2.30.2